icon-helper: remove useless checks
authorCosimo Cecchi <cosimoc@gnome.org>
Thu, 1 Dec 2011 00:04:17 +0000 (19:04 -0500)
committerCosimo Cecchi <cosimoc@gnome.org>
Thu, 1 Dec 2011 00:04:17 +0000 (19:04 -0500)
When we change storage type, we always clear the rest of the object, so
these checks do not add any safety.

gtk/gtkiconhelper.c

index 063b7a850556b7f2612d3e6e760a8230eb28956a..30f7e2cbebfc8e71ff2cb11761383968375e53c3 100644 (file)
@@ -502,54 +502,36 @@ _gtk_icon_helper_get_pixel_size (GtkIconHelper *self)
 GdkPixbuf *
 _gtk_icon_helper_peek_pixbuf (GtkIconHelper *self)
 {
-  g_return_val_if_fail (self->priv->storage_type == GTK_IMAGE_PIXBUF ||
-                        self->priv->storage_type == GTK_IMAGE_EMPTY, NULL);
-
   return self->priv->orig_pixbuf;
 }
 
 GIcon *
 _gtk_icon_helper_peek_gicon (GtkIconHelper *self)
 {
-  g_return_val_if_fail (self->priv->storage_type == GTK_IMAGE_GICON ||
-                        self->priv->storage_type == GTK_IMAGE_EMPTY, NULL);
-
   return self->priv->gicon;
 }
 
 GdkPixbufAnimation *
 _gtk_icon_helper_peek_animation (GtkIconHelper *self)
 {
-  g_return_val_if_fail (self->priv->storage_type == GTK_IMAGE_ANIMATION ||
-                        self->priv->storage_type == GTK_IMAGE_EMPTY, NULL);
-
   return self->priv->animation;
 }
 
 GtkIconSet *
 _gtk_icon_helper_peek_icon_set (GtkIconHelper *self)
 {
-  g_return_val_if_fail (self->priv->storage_type == GTK_IMAGE_ICON_SET ||
-                        self->priv->storage_type == GTK_IMAGE_EMPTY, NULL);
-
   return self->priv->icon_set;
 }
 
 const gchar *
 _gtk_icon_helper_get_stock_id (GtkIconHelper *self)
 {
-  g_return_val_if_fail (self->priv->storage_type == GTK_IMAGE_STOCK ||
-                        self->priv->storage_type == GTK_IMAGE_EMPTY, NULL);
-
   return self->priv->stock_id;
 }
 
 const gchar *
 _gtk_icon_helper_get_icon_name (GtkIconHelper *self)
 {
-  g_return_val_if_fail (self->priv->storage_type == GTK_IMAGE_ICON_NAME ||
-                        self->priv->storage_type == GTK_IMAGE_EMPTY, NULL);
-
   return self->priv->icon_name;
 }